From: Ewan Mellor <ewan@xensource.com>
Date: Thu, 28 Dec 2006 15:00:15 +0000 (+0000)
Subject: Fix booting caused by recent thinko.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15422^2~141
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=79173455841427be9b620dbb8e318a09fe3c515d;p=xen.git

Fix booting caused by recent thinko.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
---

diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py
index 54573d4f13..3fb2bd0bb9 100644
--- a/tools/python/xen/xend/XendConfig.py
+++ b/tools/python/xen/xend/XendConfig.py
@@ -1106,7 +1106,8 @@ class XendConfig(dict):
 
         self['PV_kernel'] = sxp.child_value(image_sxp, 'kernel','')
         self['PV_ramdisk'] = sxp.child_value(image_sxp, 'ramdisk','')
-        if not self['PV_bootloader'] and self['PV_kernel']:
+        if not self['PV_bootloader'] \
+               and sxp.child_value(image_sxp, 'kernel', ''):
             # We've set PV_kernel using the call above, so now we need to set
             # PV_bootloader as well, otherwise we're going to do the wrong
             # thing on reboot.